Merge branch 'origin/master' into places-sidebar

diff --cc docs/reference/gtk/gtk3-sections.txt
Simple merge

diff --cc gtk/gtkfilechooserbutton.c
Simple merge

diff --cc gtk/gtkfilechooserdefault.c
index d97bf1a738acbbebb7de9c62ec63f0f42abcbed0,498efd135d717907af781658c4c8758a055ab3ba..996c7fc01e62fd915f518d76f24236738a15f742
--- 1/gtk/gtkfilechooserdefault.c
--- 2/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@@ -338,9 -385,14 +338,9 @@@ static void path_bar_clicked (GtkPathBa
                                gboolean               child_is_hidden,
                                GtkFileChooserDefault *impl);
  
 -static void add_bookmark_button_clicked_cb    (GtkButton             *button,
 -                                             GtkFileChooserDefault *impl);
 -static void remove_bookmark_button_clicked_cb (GtkButton             *button,
 -                                             GtkFileChooserDefault *impl);
 -
  static void update_cell_renderer_attributes (GtkFileChooserDefault *impl);
  
- static void load_remove_timer (GtkFileChooserDefault *impl);
+ static void load_remove_timer (GtkFileChooserDefault *impl, LoadState new_load_state);
  static void browse_files_center_selected_row (GtkFileChooserDefault *impl);
  
  static void location_button_toggled_cb (GtkToggleButton *toggle,

diff --cc gtk/gtkfilesystem.c
Simple merge